fix for issue #18