Merge "Fixes incorrect assertion check"