Offset issues resolved