Fixing issue 148, grey buttons on events