Fix with 0.8.6 offset