1C integration + fix