Fix #16, #24.