some work for #1482