improved the crash fix implementation from the last commit