Fixed #735