Fixing errors at Final phase