Fix manual button handling define per #2

Thought I had fixed this issue previously