Github issues #191, #192