Fix point 2 in bug #1001264

Testing in dev.