Fix #16.