Fixed asserts