#165: fixed