Fixed #1447