Hotpatch to fix timeout issue (gholt said it was ok) :)