Solved more assertions