lergo-519 and lergo-505 issue 3