Attempt to fix an npe