Quick fix for recalc bug