Fixing auto fetch