Maybe a fix? At least there's more asserts