Bugfix and a small adjustment