More toward GitHub issue #56