Fix problem with returned data