Little nullable fix