Fixed #609