Fix as note in pull 141