Fixes #5544 

 Fixes #5544