Local env fix, use whats sent