Change return syntax to be 1.0 compatible