Added proposed modal fix.