hopefully fixed shit