roll back fix bug general_0_5