Fixed #1478