Added check for www