Applied Vikram's second patch. Couldn't auto-apply