fixed NPEs