Fix for the Crabby bug.