Fix wrong returned data