Resolve fatal error, introduced in 7d4613e7a820c3fcb775c40ae142ca7c6f646ab1