Fixed #1410