Fixed time out issue