Additional fix for issue #1441