EJ-60: updated close method