An easy way around latest child/toddler bug