Fixing recalculation bugs..