Fix for release 38