Christopher Schäpers authored 11 years ago

Fix #2557 and make the whole code more usable.