Fix for pierre