fix <a href="http://drupal.org/node/48376">48376</a>,  <a href="http://drupal.org/node/42095">42095</a>,  <a href="http://drupal.org/node/34976">34976</a> (but this new feature is untested)