Find bugs and fix it