Fixed possible bug