Controller bug fixed