Resolve #274 issue