oleg fix from a1