Fixed #1286