Bugfix - show_on broken in merge