fixed merge #226