Fix for issue #133