another attempt to squash long running timeouts/crashes