v2.0a17 - important (untested) fix