adjust to 1.8 syntax