Enable fast finishing

Close #336.