this should do #66
close #66