Fix for nested service responses