Fixes assertions