Made work with scrib 2.0.5