temp fix for an undetected crash. working on the permanent fix