Fixing errors at Finishing Phase