fixed conflicts with bug 1342 updated