Fix #7