2.47.2-rc Fix for issue #426