Fixed possible nil