hack to work on the latest release