Proper fix of 2da02c8f478593c14a595bea2.  Fix #150