FIX #2767 & original problem of #3208