Fixed problem with nil