Fix #47

Fix #47