Fix application bug