Adding back assert, fix was wrong