lock guard to 1.6 for 1.8.7 support