removed shiro, fixed #9