Fix/lags

See #34