fixing offset bug for real