Fixed #407.