A little margin/padding would go a long way