bugfix and speedup