There seems to be a better way to do this