moved forwarder fix to welcome