Error fixing done