Fix and readd previous patch