Squashing one more bug ;P