#150, 'draw' object creation logic changed!!!