Attempt working around sip issues