Maciek's patch part2