Resolve #47