fix 1109: revisi & history