Fix last-child issue