Squashed another bug