some fixes of 16 dec 14