Horia's patch + some printks