Fix #7, #16