3.0.4 compatibility