issue 478 fix