FIX part of #2301, and #1619