Bugfix and new API