No better way to do this? :/