Complete the code for bug #449"