Second. Fixed bugs