Fixed offset issues.