Bugfix & improvement