Fixes issue #55.