small polishing before writing a test. A faster version without conversions on the way