Fix for i25. Thanks again to Fabian.