Version 2.1.1: Bugfix