possible solution for issue 852