Back to basics. Ensure correct propagation