issue fixed draft