Fixed for 0.13 syntax changes