Fixes #6647

Fixes #6647
@moderndeveloperllc Ok, I removed the additional tests, thank you.