Fix #12
Complement #12
Update #