Bug no 1750

Second attempt.