Fix for Fabrice