Yes, this will need to be sorted soon. If I haven't already added an issue
for it, I will soon...