Fix for compatibility