Merge "Fix crash by wrong assertion check"