making changes for compatibility with 9d405812cb7fa5368c55b8632dff070b2bcabbcc