Fixes #5405 fixes fatal error