Grotesque oversight, Actually fixes issue #20