Fixed #1258