FIX #1667462