fixed a bug #35