Fixing bug introduced by last checkin