The easiest solution(possibly a cop out) for 1.8.7... Upgrade to Snow Leopard.