Fixed nils not being sent