Issue #119 & #120