hopefully fixed things