fix bug on waterloo