Assertion fixed and stuff