Bug Fix #8626

Let me know if a test case is needed