Fix Luc's bug