Fixed #1305