Added timeout. Ugly hack to fix the ugly thing.