MINOR - Improved compatibility