Fix application behaviour