Eric fixing stuff