We’ll come up with a better solution soon