#159 fix