Fixing parent/child bug