Forgot to test before committing, better now...