issues #167 #165