Fix to work with ranch fork.