Fixed problem with null