Fixed buttonMap assignment to go to actual object