Fixed #1526