Fix #12 & Fix #13