proper fix for Bug: 12212