direct fixes for #178 #177