Fix for compatibility issue