Implement fix across all api