fix for #35 #39
1.7.11