Fixing as per #2.