Fixed CrossRH bug