Support for husk scheme 3.7