fixed both instances