Fix for #3544

Fix for #3544