fixed control and fixed timing bug