Bugfix - didn't apply url on loop-around scenario