Fix #7

Fix #8