More americanisation. Fixes #1 again