MANTA-17 fixing negative offset bug