improve asserts