Fixed nullable issue