Fix #107

Fix #107