Fixed #4294
Bug #4294 fix enhanced