Adding a proper timeout value