Bugfix #2.1 finally fixed