Should we fork that module perhaps?