Fix error returning