Fixed nil exception