fixed problems after last megamerge(tm)