Possible fix for baby entities moving over time