hacking around deprecation warnings