Fixed nil return