fix bug #12  and remove timeouts