FIX #1667529