Fix #16 & Fix #17