Bug fix

Fix drawing. Need to test.