Fix for issue #169