Removing assertion debugging and possibly fixing bug