Fixes issue #389 partially.