Bug fix from last checkin