Fix brendan's bug