Fixed #430