Fix for release 0.2.21