Few bug remaining