* Fixed 'Application not responding' error happening in some cases