possible solution for #832