address @josef-pkt comments