inheritance bug rolled back