Temporary fix for overlap. More to come.