fixed self returns