Fixed issue #119 & #120