fixed controlissues