Bugfix and vervose