Fix luc's bug