#94 - fix