Resolve #6