Add vincenzo's patch