Fix BIT #1962