Resolving variables - reversed fix for PORT