Fixed button clicking not working right