yet to fixed controller bug