Merge a fix to resolve an assertation logic error.

This merge will resolve an assertation logic error.