Bugfix & extension