fix for Github issue #125