Fixed the crazy bug