Bug/spec 2.0 compat