I believe this hack is no longer required