Fixed #407