self/master:fix 17
T/master: fix18