Resolve #42