Fix Assertion Error