data return bug fixed