fix #271
fix #256
fix #208
yay, possibly ...