Reviewed: Fixed minor issue found during core review