FIX #1667515
FIX #1667462