Fixes compatibility with 0.8 snapshot(standalone branch).