Fixed 3.0.12 compatibility