Fixing buggy code I checked in