-- fix asserts