Fixing compatibility