Fix for issue #170