Fix for release 2.0.12