Fix to handle non-default parents