finally fixed hirschberg