Short codes are now correctly generated.