fix issue ##2365