fixed problems after merger