Unity 3D Bug Fix by Carlos Hopfer