Add Strict aliasing fix