There's something that bugs me about it, but leave it as-is for the moment