Fixed returned data