FIX: Ontimeout issue