Fixed the mess I have done