Added offset bug