1.2.2.8 BUGFIX