hopefully fixed persisting issue