Update for comment in #338, #340