fix 1.8.1 incompatibility