fix propagation issues