this requires more investigation; possibly post-1.10