Fixing compatibility issue with 8dcf9e674a