Fixes issue #101 -- another janky fix