fixes for issues #65 #66