Possible fix for random errors