Some application fix