Fixing bug 732