Add timeout, cannot test at the moment