MANTA-17 fixing 1 offset bug