May have fixed Screenshot issue
Merge with screenshot fix