#323 - make it work in new working config