Fix for issue #16