Squashed huge bug!