fixes. still not working though.