Fix for potential alignment issue/inconsistency.