Changed hardcoded return point to current domain