This fixes issue #36

Is this fixed?