trying a fix for issue #25