Fixed #1178.
Fixed #970
Dev build 425