issue6482: try to support fix for issue2649 (not working)