Some fix. not Ready