Fixed Controller bug