Fixed for new REST interface