fixed a problem from the merge