Try to fix bug in Admin and Client  Application