try to fix controls  bugs