Addition to v3.0.3