Timeout-fix