hopefully fixed everything now