Fixing that bug Andrew found :P