Reworked to make the prefix if missing.