Changes to make it compatible with https://github.com/tailwindsllc/modus/pull/7