This doesn't seem to be the best solution