Fixed issues with bounce buttons