issue#4: fix