hopefully fixed bugs