Fixes issue #19 , when possible