temporary fix npe