Finally hopefully fixed