possible fix for issue #23