Fix Pepita issue