fixed good-program-returns and its related entitiy