Resolve #57