This fixes issue #9 for me.