Fix for issue #2451