Fix for erroneous asserts