Resolve #625