Fix this to be a little more correct