fix for #3 #4