issues #59 #60