Fix #7

Fix #7