Fix Draw being private