Fixed: respect the given prefix