Fix incorrect item => Child swaps