FIXED a bug