close #69
close #56
further fix for #68