Timeout related bugfix