#170 fix