Fixed switching to child!!