Fixed Controller Bug