Core pr 6

Minor issue from last PR review.