Fix the todo by doing some normalization?