fix: returning non-objects