Fix early returns. Close #83