Bugfix bnc#886238