I hopefully fixed bug