hopefully fixed nullcodecrash