Fixing mapping between buttons