Fixed a conflict with the end buttons