Fix #16 (2)