Rough fix for url only