#159 fixed