Add flag, for 1.8.7 only