Possible fix to issue #451