Fix Neil's bug