Fixing issue performance