Fix always increasing types issue