final fix so that application timeout does not dissapear when app timeout is turned off.