Special handlling for timeout refs #11