Fix for issue #100