Fix #106 & Fix #109 & Fix #120