Fix issue multiple third-party apps