hopefully fixed stuff