fixed some data reference issue