Hacky fix for stitch issue