Bug fix with some links