fixed issue 7914