Fix #7 also