possible solution for #915