issue#33: fixed