fix for issue #23