Correction for issue #545