Bugfix in library merged into rework.