Strict Aliasing Fix

Change-Id: I4c0b28df25922fa27c467dbbddbd674bf1ed8f14