fixing extra-asserts crashes