Revert "Revert "Update goof fix""

This reverts commit 74372d03307bfa711d2e20d12017627fd9ee9b0c.