Resolve #59