fix last method