Fixed compile error with data redefining