Fixed #534.