Fixing hot potato gh issue