fixed button pressing
fix conflict