more issue fixed