quick fix to breaking changes