Fixed very bad bug