New fix for issue #332