Remedied breaking changes