Added offset for #139