#166 : polish