Removed more assert in favor of assert*