Attempt 2 to fix Strict Aliasing