Bugfix, improvement