Updated to make work with scrib 2.0.7