Fix for version 8.40