Fixed issue #86 again in two other cases. (Staging, Event Menus)