fix draw bugs