draft issue fixed