Issue 36

Is this fixed?