Move stastd patch to initialization