Fix for v.0.2.1.25