Fix non-1.8.7 syntax