Fix BIT #861