FIX: timeout was not working