Seriously, this fixes issue #3