same changes related to #2259