Short codes are now correctly generated. I think.