fixes shiro collaboration