Fix for self == nil