#410 fix code