Bug fix from previous checkin