fixed cross-compatibility