This should use `common.PORT`