[DONE] fixes