Couple of asserts and fix