Bugfix + addition