Fix erroneous asserts from previous commit