This has been fixed by the above patch. Adding before and after patch screens...