As expected, Fixed bugs