Should fix spawn NPEs