one more Dima's patch