Fix for REST interface