This is dumb. Fixed Merge of draw.cpp