Better fix for Snow Leopard only bug