Fix overlap problem with labels