Other side of #579