Related to discussion in #1038
Related to discussion in #1038