fixed last case