fix getting current structure