Correct relevant fix from issue #374