Fixed the "Bug"