Strict Aliasing Fix

Change-Id: Iebd61ca581c558f7097cf4db85360fb9c50a2db3