Fix check for current_gon presence