Maintain 1.8.7 syntax compatibility