Add timeout trick