application logic fix