Fixed handling of assertions