second commit with hates fix