Fix for Submitted Screen