Fix for issue #127