format: added support for both versions