control buttons bug fixed