Bug fix for switch to REST