Fixed hit and Stay buttons issues