Better fix to issue #4