Fix on RELEASE build