Fix some code developed for timeout feature not available yet