perfomance issue fixed