Fixing a bug and increased timeout to 3 sec