Added bug fix to fix mission related crashes