fix asserts, #15