3.8.7
Fix #394