Fixed #2604