restore partial static block fixes till it will be fixed w a whole