20140604 edit bug