Fixed #1515