fix bugs (bad commit message >_>)