Fix for Ivan