#142 - fix