#159: fixed