Fix this better