draw issue fixed