Fixed a very bad bug