Fix for assert