Fixed a huge bug