Seems like a reasonable temporary solution