Bug with URLs fixed