Fixes issue with #95

logic is hard