Made a more efficient fix.