Minor scheme change