Minor: Added missing lines from Chris' commit