Random tiny changes, hopefully fixed the bug