[#PB1] for the last time, make it work

request by Eugene