Fixed cross-compatibility