bugfix and new optimization