update bug
Merger submitted