Fix for issue #178