Backward 4.0.4 Compatibility Update