Make Compatible with RH6