Fixed #2606