fixes issue #23