Shared mondrian fix