Use stack variable always instead of data_N, related to #22