S5 repo fix