possible fix for the crashes
possible fix for the crashes v2