Resolve #80