AI-499 : implemented Alex's idea with spacer