Possible fix for random crash