Bug fix for paul.