Advance in #1638