gc and perfomance fix