Fixing application text logic