Fixed is present waiting for 30 sec issue