fixed problems caused by merging