Fixes new return format