Merge "Change to use proper type"