Bugfix and improvement