Fixed bug with duplicate call to finish()