Bugfix emergency

merging bugfix emergency with branch 2