Fixed normalization for real this time