Fixed Controller Issue