201301 bugfix integration