make compatible with 1.9.3 again