Squashed last minute bug