fixed wrong merge; new vers. 4.00.393