FIX #1434