fix empty current_gon issue