#164 fix