issue 2258 fixed