Fix for issue #371. For sure this time.