Fixes issue #6
WIP