hopefully fixed bug