Fix for silly return object