Fixed #573