Fix clipping on joints

Some good ideas in this thread: