fix #18

Fix #18