fixed a problem caused from merge