Fixing Jan's bug.