Try fixing the callers of normalize instead