Update depend
Fix broken macro for 1.8.7