Fix bug 1001264

Testing in dev