Version 2.1.8: Bugfixes