Fix for issue #23