temp fix peformance issue