Try to add a bit of timeout logic for #6