Partner quick fix