Fixed #4505