Fixing when setting nill