on_fig conditional fix.