Resolve #1092