Added timeout (a bit crappy)