fixed merge #226
merge fixed #226