Fix this a little