corrected bug with calculated columns