Fix for issue #126

Details in issue #126