fix
zack take a look at this code