fixed issue partially, still not feature full fix