Corrected Michael's fix to #7
added unwind
really added unwind